account/views.py

@@ -128,7 +128,7 @@ def user_login_api(request):

                     })
              

                 
              

                 
              

                -def wx_authorize_api(request):
              

                +def user_wx_authorize_api(request):
              

                     user_id = request.POST.get('user_id', '')
              

                 
              

                     openid = wx_uid = request.POST.get('wx_uid', '')
              

api/urls.py

@@ -19,7 +19,7 @@ urlpatterns = [

                     url(r'^u/signup$', account_views.user_signup_api, name='user_signup_api'),  # 用户注册
              

                     url(r'^u/login$', account_views.user_login_api, name='user_login_api'),  # 用户登录
              

                 
              

                -    url(r'^u/wx/authorize$', account_views.wx_authorize_api, name='wx_authorize_api'),  # 微信用户授权
              

                +    url(r'^u/wx/authorize$', account_views.user_wx_authorize_api, name='user_wx_authorize_api'),  # 微信用户授权
              

                 
              

                     url(r'^u/guest/status$', account_views.guest_status_api, name='guest_status_api'),  # 游客状态(是否开启)
              

                     url(r'^u/guest/login$', account_views.guest_login_api, name='guest_login_api'),  # 游客登录
              
@@ -27,8 +27,11 @@ urlpatterns = [

                 
              

                 # 摄影师相关
              

                 urlpatterns += [
              

                -    url(r'^l/submit$', lensman_views.lensman_submit_api, name='lensman_submit_api'),  # 摄影师登录
              

                +    url(r'^l/submit$', lensman_views.lensman_submit_api, name='lensman_submit_api'),  # 摄影师信息提交
              

                     url(r'^l/login$', lensman_views.lensman_login_api, name='lensman_login_api'),  # 摄影师登录
              

                +
              

                +    url(r'^l/wx/authorize$', lensman_views.lensman_wx_authorize_api, name='lensman_wx_authorize_api'),  # 微信用户授权
              

                +
              

                     url(r'^l/photos/upload$', lensman_views.lensman_upload_photo_api, name='lensman_upload_photo_api'),  # 摄影师上传照片
              

                 ]
              

                 
              

group/lensman_views.py

@@ -10,6 +10,7 @@ from django.conf import settings

                 from django.contrib.auth.hashers import check_password
              

                 from django.core.files.storage import default_storage
              

                 from django.http import JsonResponse
              

                +from logit import logit
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 from account.models import LensmanInfo, UserInfo
              
@@ -87,6 +88,23 @@ def lensman_login_api(request):

                     })
              

                 
              

                 
              

                +@logit
              

                +def lensman_wx_authorize_api(request):
              

                +    openid = wx_uid = request.POST.get('wx_uid', '')
              

                +    unionid = request.POST.get('unionid', '')
              

                +
              

                +    # 判断 unionid 是否已经存在，如果已经存在，则直接返回改帐户信息
              

                +    try:
              

                +        user = UserInfo.objects.get(unionid=unionid)
              

                +    except UserInfo.DoesNotExist:
              

                +        return response(LensmanStatusCode.LENSMAN_NOT_FOUND)
              

                +
              

                +    if user.user_status != UserInfo.ACTIVATED:
              

                +        return response(LensmanStatusCode.LENSMAN_NOT_ACTIVATED)
              

                +
              

                +    return response(200, 'Lensman Login Success', u'摄影师登录成功', user.data)
              

                +
              

                +
              

                 def lensman_upload_photo_api(request):
              

                     """
              

                     摄影师上传照片
              

isort.sh

@@ -1,3 +1,3 @@

                 #!/bin/bash
              

                 
              

                -isort -rc -sp .isort.cfg .
              

                +isort -rc -sp . .
              

requirements.txt

@@ -7,7 +7,7 @@ cryptography==1.2.1

                 django-curtail-uuid==1.0.0
              

                 django-detect==1.0.4
              

                 django-json-response==1.1.3
              

                -django-logit==1.0.2
              

                +django-logit==1.0.3
              

                 django-multidomain==1.1.4
              

                 django-shortuuidfield==0.1.3
              

                 djangorestframework==3.3.1
              

utils/error/errno_utils.py

@@ -20,7 +20,9 @@ class LensmanStatusCode(BaseStatusCode):

                     LENSMAN_PASSWORD_ERROR = StatusCodeField(400002, u'Lensman Password Error', description=u'摄影师密码错误')
              

                 
              

                     LENSMAN_PHONE_ALREADY_EXISTS = StatusCodeField(400005, u'Lensman Phone Already Exists', description=u'手机号已经存在')
              

                -    LENSMAN_ALREADY_NOT_UNVERIFIED = StatusCodeField(4000010, u'Lensman Already Not Unverified', description=u'摄影师帐号已激活')
              

                +    LENSMAN_ALREADY_NOT_UNVERIFIED = StatusCodeField(400010, u'Lensman Already Not Unverified', description=u'摄影师帐号已激活')
              

                +
              

                +    LENSMAN_NOT_ACTIVATED = StatusCodeField(400015, u'Lensman Not Activated', description=u'摄影师帐号未激活')
              

                 
              

                 
              

                 class UserStatusCode(BaseStatusCode):